Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] Improve the Makefile to make it more robust to other environments. #1063

Merged
merged 2 commits into from
May 23, 2024

Conversation

michaelsafyan
Copy link
Contributor

Fixes

  1. Failure on systems with podman-is-docker where /etc/containers/registries.conf does not contain a fallback registry for security reasons and thus requires that the container registry be specified explicitly.

2 . Failure with "fatal: No names found ..." when using make compatibility-check in developer branches.

Details

This change improves the Makefile by providing an explicit registry for the otel/weaver and otel/semconvgen containers. By default, it prefixes these with docker.io/, but uses a variable to make it easy to override.

In addition, the logic for determining the latest version of the semantic conventions is updated from using git describe to git ls-remote so that light-weight branches that haven't pulled down the list of tags can also invoke this.

Merge requirement checklist

  • CONTRIBUTING.md guidelines followed.
  • Change log entry added, according to the guidelines in When to add a changelog entry.
    • If your PR does not need a change log, start the PR title with [chore]
      ^^^^ Done
  • schema-next.yaml updated with changes to existing conventions.
    ^^^^ N/A; does not update existing conventions

@michaelsafyan michaelsafyan requested review from a team May 22, 2024 19:38
@lmolkova lmolkova merged commit dadb51b into open-telemetry:main May 23, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants